Skip to content

[codex] Refresh repair handoffs after main advances#50

Merged
mberman84 merged 2 commits into
mainfrom
codex/prevent-side-door-merges-auto-repair-20260622
Jun 22, 2026
Merged

[codex] Refresh repair handoffs after main advances#50
mberman84 merged 2 commits into
mainfrom
codex/prevent-side-door-merges-auto-repair-20260622

Conversation

@mberman84

@mberman84 mberman84 commented Jun 22, 2026

Copy link
Copy Markdown
Contributor

What changed

  • refresh a conflict-repair handoff whenever main advances, even when the PR head and error text are unchanged
  • preserve the original bounded repair-hold start so repeated main movement cannot extend the hold forever
  • include the complete sealed PR→head map in integration repair packets and replace legacy/incomplete packets
  • prove token-authored pull_request placeholders cannot suppress DeployBot-owned exact-branch CI dispatch
  • surface the source-thread resume action in slow queue alerts
  • explicitly forbid provider-side and direct-to-main merges in bundled agent guidance

Root cause

An existing merge-queue-blocked marker caused later promotion passes to treat a repair as already handed off. When main advanced again, affected source threads did not receive a fresh handoff for the new base SHA. Integration repair packets also omitted the complete sealed membership, making it harder for owners to prove every frozen source was present.

Validation

  • PYTHONPATH=src python3 -m unittest discover -s tests — 258 passed
  • python3 -m ruff check . — passed
  • final autoreview — clean, no actionable findings

@mberman84 mberman84 marked this pull request as ready for review June 22, 2026 21:01
@mberman84 mberman84 merged commit a3fee5a into main Jun 22, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant